auto merge of #1036 : brson/cargo/flakeywindows, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 11 Dec 2014 23:28:54 +0000 (23:28 +0000)
committerbors <bors@rust-lang.org>
Thu, 11 Dec 2014 23:28:54 +0000 (23:28 +0000)
commit3c86cb51ba86ed2f4da49953021da579d91626d8
tree8079968dbf759fe4a99e501b6939244f5259f944
parentdf029b4035fbe52e41c071c4324e8d2e1d7d9510
parentd8d59e40a2894ce0eb7903ad4fb4ebcd3ef78676
auto merge of #1036 : brson/cargo/flakeywindows, r=alexcrichton